From 6f23c61e5df5a18d58e0c92d8eab24f3cb62e8d1 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Wed, 20 Jun 2007 15:08:32 +0100 Subject: [PATCH] x86: Use 64-bit arithmetic in reserve_in_boot_e820(). Signed-off-by: Jan Beulich Signed-off-by: Keir Fraser --- xen/arch/x86/setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 129621a4ca..23e216ac44 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -295,14 +295,14 @@ static struct e820map __initdata boot_e820; /* Reserve area (@s,@e) in the temporary bootstrap e820 map. */ static void __init reserve_in_boot_e820(unsigned long s, unsigned long e) { - unsigned long rs, re; + uint64_t rs, re; int i; for ( i = 0; i < boot_e820.nr_map; i++ ) { /* Have we found the e820 region that includes the specified range? */ rs = boot_e820.map[i].addr; - re = boot_e820.map[i].addr + boot_e820.map[i].size; + re = rs + boot_e820.map[i].size; if ( (s < rs) || (e > re) ) continue; -- 2.30.2